Add GtkGLArea to the widget gallery
authorMatthias Clasen <mclasen@redhat.com>
Wed, 22 Oct 2014 04:55:39 +0000 (00:55 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 22 Oct 2014 05:13:00 +0000 (01:13 -0400)
docs/reference/gtk/Makefile.am
docs/reference/gtk/images/glarea.png [new file with mode: 0644]
docs/reference/gtk/visual_index.xml
docs/tools/Makefile.am
docs/tools/widgets.c

index b27ad71f643ae413e7b113dfe7a92d2845505b4b..f1b067d1b5dfba60acffb973e6d4d1991e9b1a12 100644 (file)
@@ -206,6 +206,7 @@ HTML_IMAGES = \
        $(srcdir)/images/font-button.png                                \
        $(srcdir)/images/fontchooser.png                                \
        $(srcdir)/images/frame.png                                      \
+       $(srcdir)/images/glarea.png                                     \
        $(srcdir)/images/headerbar.png                                  \
        $(srcdir)/images/icon-view.png                                  \
        $(srcdir)/images/image.png                                      \
diff --git a/docs/reference/gtk/images/glarea.png b/docs/reference/gtk/images/glarea.png
new file mode 100644 (file)
index 0000000..e90ee6e
Binary files /dev/null and b/docs/reference/gtk/images/glarea.png differ
index b9e143006d513909f3adac210e1b3fe2f880f5c0..6e58e5397c9e24d284d37bca50841d6bb18f53f5 100644 (file)
@@ -42,6 +42,9 @@
     <link linkend="GtkScale">
       <inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
     </link>
+    <link linkend="GtkGLArea">
+      <inlinegraphic fileref="glarea.png" format="PNG"></inlinegraphic>
+    </link>
   </para>
 </section>
 
index e3b2966bada0ee80c8779b11d5dc3e318af31cb9..31982aec39d6747f79c19c69b8cdb5716a500dc8 100644 (file)
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \
        -I$(top_srcdir)/gdk/x11         \
+       -I$(top_srcdir)/tests           \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)
 
@@ -30,7 +31,9 @@ doc_shooter_SOURCES=  \
        shadow.h        \
        shooter.c       \
        widgets.c       \
-       widgets.h
+       widgets.h       \
+       $(top_srcdir)/tests/gtkgears.c \
+       $(top_srcdir)/tests/gtkgears.h
 
 clean-local:
        for file in *.png; do \
index ecd2399e2803dc35a0ea171d5372c10cd6c09a82..dc455e241b44d4dfda9e9f9d727cd7e85b34c1b9 100644 (file)
@@ -8,6 +8,7 @@
 #include <X11/Xatom.h>
 #include <gdkx.h>
 #include "widgets.h"
+#include "gtkgears.h"
 
 #define SMALL_WIDTH  240
 #define SMALL_HEIGHT 75
@@ -1480,6 +1481,24 @@ create_flow_box (void)
   return info;
 }
 
+static WidgetInfo *
+create_gl_area (void)
+{
+  WidgetInfo *info;
+  GtkWidget *widget;
+  GtkWidget *gears;
+
+  widget = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
+
+  gears = gtk_gears_new ();
+  gtk_container_add (GTK_CONTAINER (widget), gears);
+  info = new_widget_info ("glarea", widget, MEDIUM);
+
+  return info;
+}
+
 GList *
 get_all_widgets (void)
 {
@@ -1544,6 +1563,7 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_search_entry ());
   retval = g_list_prepend (retval, create_level_bar ());
   retval = g_list_prepend (retval, create_info_bar ());
+  retval = g_list_prepend (retval, create_gl_area ());
 
   return retval;
 }